Merge "Populate uniq field in uhid." into rvc-dev