Closes #18722 By Rushor (cherry picked from commit 5c04590fddcb84e58fc9f699ccf4723d9aa4fc96)
hotfixes