Merge "user-mgmt role added"