Closes #19381 By @Vyrsenth (cherry picked from commit ae624c7d8189e7964a69425a9edde05724d51f72)
hotfixes