Revert "Revert "Merge branch 'master' into cassandra-test"" This reverts commit 12c5035a35852d43373dc2ade817974865c38a45.