Merge "ExternalRoleDetails class fix"