Merge "Migrate to override_role for identity module (part 1)"