Closes #18570 By Rushor (cherry picked from commit 9a6fac98b9c57d8c4217463003883e039c068312)
hotfixes