Merge branch 'master' into upgrade/jdk-and-jakarta