Merge "Add dynamic keyspace creation" into release-1.1.0