By Rushor Closes #18449 (cherry picked from commit 7567213dad2b9886324de9926c9d2c372fb402b3)
hotfixes