Merge branch 'cassandra-3.9' into trunk