Closes #18581 By Rushor (cherry picked from commit f47e4201ec84dbe5760d206e6a65616070f32eb6)
hotfixes