Test for CASSANDRA-8062
Merge remote-tracking branch 'origin/CASSANDRA-8062'