Changes from CASSANDRA-7575