Merge pull request #90330 from jckarter/throw-propagation-borrow-scope-fix