Closes #18669 By Rushor (cherry picked from commit 7c6888719858ab3646b001c31370f383ef442a0e)
hotfixes