DSP-1658 Backport CASSANDRA-5280/5203