Merge branch 'cassandra-4.1' into cassandra-5.0

* cassandra-4.1:
  Backport CASSANDRA-16418 to 3.x