Resolve #3539894 "For 2.1.x"

Closes #3539894

Merge request reports

Loading