Merge pull request #870 from ForgeRock/fix-mend-sca

Long-running branch `main` detected. AI fixes are only available for pull requests from short-lived branches