Merge "Remove deprecated switch_role method"