Closes #18585 By Rushor Thanks to Grz3s (cherry picked from commit 78ad3385fa04a4be65ef91ff14763097836fc2cc)
hotfixes