Closes #18736 By Rushor (cherry picked from commit e8f1f3a7f986c0d4ff404af6fad671b5a80b1a30)
hotfixes