Merge "Add capability for multi-role support"