Merge pull request #17991 from eileenmcnaughton/merge_single