Sync with upstream master
Purpose
The purpose of this PR is to sync with the upstream master.
Goals
N/A
Approach
N/A
Documentation
N/A
Automation tests
N/A
Security checks
- Followed secure coding standards? (yes)
- Ran FindSecurityBugs plugin and verified report? (yes)
- Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes)
Related MRs
N/A
Test environment
N/A
Learning
N/A