Closes #18668 By Rushor (cherry picked from commit cac8e59bead287bd335bd83515b7d3030b4f76cf)
hotfixes