Apply patch from comment 14

Closes #2945928

Merge request reports

Loading