Merging for database creation script, required for script
assigned to @c2038058
mentioned in commit ddc89a23
merged