Merge pull request #10904 from BruceForstall/ArmMergeCodegenFuncs