Merge pull request #862 from ForgeRock/SDKS-5468-mend-scan

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