Merge "Fix pm create-user when creating user with profile of cur" into tm-dev