chore: merge master 21.0.0 back into develop

[UdjinM6]

Issue being fixed or feature implemented

Suppressed changes from be83865959d0d4b77be123140a08acea3f3bc138 so the diff is empty.

What was done?

How Has This Been Tested?

Breaking Changes

Checklist:

• [x] I have performed a self-review of my own code
• [ ] I have commented my code, particularly in hard-to-understand areas
• [ ] I have added or updated relevant unit/integration/functional/e2e tests
• [ ] I have made corresponding changes to the documentation
• [x] I have assigned this pull request to a milestone (for repository code-owners and collaborators only)