Apply patch from comment 35

Closes #2404259

Merge request reports

Loading