Merge "Add flags parameter for managing role holders."