GDS-1121 Incorrect cascading of removals when merging received updates

Conflicts: