Support multiple entries #17198
Remove duplicate code
Merge pull request #17964 from dmyerscough/fix-17198

Support multiple entries #17198