Issue #1337894: Apply patch from comment 39 (authored by neclimdul, omegadela, fengtan)

Closes #1337894

Merge request reports

Loading