[master] Sweep !391 !409 !410

Andre Sailerrequested to merge
cherry-pick-2-82a685ec-master into master

Sweep from !391 (merged) !409 (merged) !410 (merged)

Edited by Andre Sailer

Merge request reports