fixes from default grafted onto stable

Merge request reports

Loading