What this PR does / why we need it: Backport of #558 & #557
Which issue(s) this PR fixes(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #
Special notes for your reviewer:
I hope this will not cause merge conflict with #565.
@rthallisey , If you prefer simplicity over consistency, this includes the #565 already.
If merged here and only, the #565 can be freely abandoned.
What this PR does / why we need it: Backport of #558 & #557
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged): Fixes #Special notes for your reviewer: I hope this will not cause merge conflict with #565. @rthallisey , If you prefer simplicity over consistency, this includes the #565 already. If merged here and only, the #565 can be freely abandoned.
Release note: