Apply patch from comment 2

Closes #3383350

Merge request reports

Loading