Merge "Refactor code for initializing UserRecord"