🍒 Cherry pick PR #56448 to staging 🍒

[os-botify]

🍒 Cherry pick #56448 to staging 🍒
This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:

```bash
git fetch
git checkout roryabraham-cherry-pick-staging-56448-1
git cherry-pick -S -x --mainline 1 6799d53211de1a8e3112c0ead58047d962972faf
```

Then manually resolve conflicts, and commit the change with `git cherry-pick --continue`. Lastly, please run:

```bash
git commit --amend -m "Update version to 9.0.94-16

(cherry picked from commit d9ba4e5)" -m "(CP triggered by roryabraham)"
```

That will help us keep track of who triggered this CP. Once all that's done, push your changes with `git push origin roryabraham-cherry-pick-staging-56448-1`, and then open this PR for review.

Note that you **must** test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.

[os-botify]

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

[melvin-bot]

@nkuoch Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

[roryabraham]

Missing @