Revert cherry-pick of a revert, to put things back as they should be

This reverts merge request !440 (merged)

Merge request reports

Loading