Closes #18709 By Rushor (cherry picked from commit db1c4dac7ec67f718e64afae56e65607553a4470)
hotfixes