Merge branch '2.16' into 2.17

Author: cowtowncoder

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         java_version: ['8', '11', '17', '21']
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-latest']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps: