Closes #18642 By Rushor (cherry picked from commit 64c5f87423142242ac82bb794e3bc71f122f58e7)
hotfixes