Apply patch from comment 11

Closes #2888419

Merge request reports

Loading