Closes #18621 By Rushor (cherry picked from commit c0a5e1d6f7c33ab93969727148418a69ed5ca69b)
hotfixes