Merge branch 'bp/cassandra-db-support'