Merge "Added more properties associated with user management:"