better user identity finder for profile id
Merge remote-tracking branch 'origin/master'