Apply patch from comment 44

Closes #2973447

Merge request reports

Loading