Merge branch 'cassandra-6.0' into trunk