apply suggestions from @graven for !3155

Apply suggestions from !3155 (merged)

Merge request reports

Loading