Closes #18610 By Rushor (cherry picked from commit 1ad6113019dab4aaf667542b16b4896a2ac16168)
hotfixes