Merge pull request #744 from ForgeRock/aj-fix-types

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