Merge "Add UNKNOWN enum to the new user properties" into main