Merge pull request #11941 from haslinghuis/remove-duplicate