Merge branch 'master' into update/jackson-module-scala_3-2.18.4