patch by Andrés de la Peña and Zhao Yang; reviewed by Berenguer Blasi for CASSANDRA-17122
Co-authored-by: Andrés de la Peña <a.penya.garcia@gmail.com>
Co-authored-by: Zhao Yang <jasonstack.zhao@gmail.com>
patch by Andres de la Peña, Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-17070
Co-authored-by: Andres de la Peña <a.penya.garcia@gmail.com>
Co-authored-by: Berenguer Blasi <berenguerblasi@gmail.com>