porting older patch

Closes #2972988

Merge request reports

Loading