Apply patch from comment 87

Closes #849602

Merge request reports

Loading