Applying patch from comment 4

Closes #3406527

Merge request reports

Loading