Merge pull request #730 from ForgeRock/fido-errors-aj-2

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