Closes #17356 By Beheadedstraw (cherry picked from commit ee3432e1063c1e4f694e92da17668da53b353d52)
hotfixes