HHH-7918 - Fix and test
HHH-7918 - Completely recalculate entity state on merge