Fix keyspace id format
Merge branch 'replication'