Pavel Yaskevich's suggestions from CASSANDRA-6689