[master] cherry pick !401 and !402

Andre Sailerrequested to merge
cherry-pick-09465d6a into master

From !401 (merged) and !402 (merged)

Edited by Andre Sailer

Merge request reports