Merge pull request #98077 from daledah/refactor/66424-6