Closes #18716 By Rushor (cherry picked from commit 31dfc0e7a72bfa1e3cd36ef0298ed11a773b42d5)
hotfixes