Apply patch from comment 10

Closes #3192591

Merge request reports

Loading