Apply patch from oriol_e9g comment 16

Closes #3383171

Merge request reports

Loading