Apply patch from comment 3

Closes #3564190

Merge request reports

Loading