Backport all non-master-specific changes from master

Merge request reports

Loading