Merge pull request #56513 from rosinL/wip-fix-65175