Closes #18683 By Rushor (cherry picked from commit 0b6d20d976a0802ea80680739fe5d4c073ac1403)
hotfixes