Merge pull request #863 from ForgeRock/update-protect

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