Closes #18647 By Rushor (cherry picked from commit 445c0539aa9bc3f554a599c748e5e5802a4eec6f)
hotfixes