Closes #18609 By Rushor (cherry picked from commit 7c392a8fc750cbfd1146dab400f06e76f881152e)
hotfixes