Merge master in dev

[antrix1989]

Proposed changes

Describe what this PR is trying to do.

Type of change

• [ ] Feature work
• [ ] Bug fix
• [ ] Documentation
• [ ] Engineering change
• [ ] Test
• [ ] Logging/Telemetry

Risk

• [ ] High – Errors could cause MAJOR regression of many scenarios. (Example: new large features or high level infrastructure changes)
• [ ] Medium – Errors could cause regression of 1 or more scenarios. (Example: somewhat complex bug fixes, small new features)
• [ ] Small – No issues are expected. (Example: Very small bug fixes, string changes, or configuration settings changes)

Additional information