Merge "Altered create database db statements"