Apply patch from comment #8

Closes #3177616

Merge request reports

Loading