Merge "Principal to contain all the user roles"