incorporate @slasher13's patch into an MR

Closes #3575924

Merge request reports

Loading