Merge pull request #98083 from daledah/refactor/66421-2