Backport needed fixes

Merged Philip Müller requested to merge backport into master

Created by: philmmanjaro

Merge request reports