Merge "Correct the name of enum UserType item" into rvc-dev