Merging fix for IDENTITY-2924