Apply patch from comment 74

Closes #3026636

Merge request reports

Loading