Rebase onto latest develop

What does this PR do? (Please give us a brief description of what this PR does.)

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

• I agree to follow this project's Contribution Guidelines
• I have made sure to test this pull request