Closes #17399 By Eliminationzx (cherry picked from commit b785242101f7be0cc6e29e86986b2184db1e43d6)
hotfixes