Closes #17209 by SnapperRy (cherry picked from commit 291a26401360abbee575224fd47f01f8b217028c)
hotfixes