CASSANDRA-5569: v2 patch