backport some fixes from master

Merge request reports

Loading