Test for CASSANDRA-8410
Merge branch 'CASSANDRA-8410'