Apply the patch from Comment #2

Closes #3568983

Merge request reports

Loading