Merge pull request #90355 from glessard/export-implementation-rename