IDENTITY-2821 changes