Merge pull request #90432 from eeckstein/fix-copy-to-borrow-opt