Bug 40137 01

Squash (but not rebased onto current master)

Merge request reports

Loading