Merge "update user/passwd"