By SnapperRy Closes #17505 (cherry picked from commit 9df55542a54525319b535e618719379afd3a261e)
hotfixes