Merge branch '5.8.x' into 6.0.x

Author: jzheaux

.github/workflows/continuous-integration-workflow.yml

@@ -55,6 +55,7 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
+          cache: 'gradle'
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v2
       - name: Set up gradle user name