Merge pull request #22569 from demeritcowboy/duplicate-file