HHH-7918 - Completely recalculate entity state on merge