Merge branch 'cassandra-4.0' into trunk