By Rushor Closes #18564 (cherry picked from commit 73f704da7ca23338d83da2ceb0472d4a0a5646a2)
hotfixes