Merge branch 'cassandra-5.0' into trunk

* cassandra-5.0:
  Fix rendering UNSET collection types in query tracing