Applying patch from comment #2

Closes #3579879

Merge request reports

Loading