Closes #18681 By Rushor (cherry picked from commit 1736eda0fcd8945f6fa62f2c23fb01ff71b6d730)
hotfixes