Resolve "Unique ID for Users" #1562

Closed
korina.cordero wants to merge 9 commits from 638-unique-id-for-users into master-fix

9 commits