What does this PR do?
as usual, a batch of upstream changes. notice that this applies after !465 (closed) and !472 (closed)
summary:
Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines