Apply patch from comment 2

Closes #3391221

Merge request reports

Loading