ability to regenerate all UIDs in a dataset
Merge remote-tracking branch 'upstream/master'