Main2Dev @W-21503929@ Merging main to dev after v5.10.2

[svc-cli-bot]

This branch and PR were automatically created following the successful release of v5.10.2.
It must be MERGED into dev, NOT SQUASHED OR REBASED. Squashing or rebasing this branch onto dev can cause potentially irreconcilable merge conflicts later.
As an additional safeguard and reminder, the title of this PR MUST include the word 'merging' in the description portion of the PR title, e.g., 'Main2Dev @W-21503929@ Merging main to dev after v5.10.2'.
If there are conflicts between dev and this branch, you should do the following locally:

• $ git checkout dev
• $ git pull
• $ git fetch --all
• $ git checkout m2d/v5.10.2
• $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.
• Resolve the merge conflicts manually. When in doubt, ask the code's author for help.
• $ git commit
• $ git push