DSP-1685 Pull in CASSANDRA-5155