Ported patch from XB

Closes #3531991

Merge request reports

Loading