Backport patch

Closes #3539152

Merge request reports

Loading