more upstream changes

What does this PR do?

a batch of upstream changes, this applies after !479 (closed) (and !472 (closed) and !465 (closed))

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