By TecDian Closes #19226 (cherry picked from commit e4492dd0bdda6e9f778993c24889c8aea10f79ab)
hotfixes