Closes #18667 By Rushor (cherry picked from commit 7362b5b7142a183306a35df6c77f147b866ba139)
hotfixes