Merge pull request #7960 from eileenmcnaughton/uniquid