By Rushor Closes #18574 (cherry picked from commit e8314e2c4aa6f12f36daee60fc6933ecdd0fcb9b)
hotfixes