Passes Cassandra
Merge remote-tracking branch 'origin/rbdevel' into kl-dev