Merge pull request #90413 from eeckstein/fix-mandatory-destroy-hoisting