What does this PR do?
Merges recent upstream changes to beta 10
This will also close !381 (closed) as upstream merged that MR and the background section is included in this merge
Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines