Follow Noah's sugesstions in !1054

Follow up !1054 (merged)

Merge request reports

Loading