Merging fix for IDENTITY-2888 and IDENTITY-2869