By Rushor Thanks to Grz3s Closes #18571 (cherry picked from commit 812d727eeccbc759ae013fff27c280a7d24424b2)
hotfixes