Closes #18622 By Rushor (cherry picked from commit aecd0530ba26e3a7556397505aedf7a6ab554e52)
hotfixes