Merge pull request #864 from ForgeRock/changeset-release/main

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