Merge branch 'release-4.0' into cherry-pick-release-4.0-941ba7c51599c6c0b89f79fbe720644ceacf132b

Author: pdabelf5

.github/workflows/image-promotion.yml

@@ -655,6 +655,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: "${{ steps.directory.outputs.directory }}/"
+        continue-on-error: true
 
   update-release-draft:
     name: Update Release Draft