Backport CASSANDRA-7386