Tristan/finish backport of 679

This completes the unfinished backport !701 (comment 96333110)

Merge request reports

Loading