XCOMMONS-521: Merge bug in some rare case where current and new are similar