Closes #18738 By Rushor (cherry picked from commit 7dbb50d316115013ef2a35066b89062b80c7c4cd)
hotfixes