am b724617b: Merge "[CB22] Merge add and delete"

* commit 'b724617b41accc60ee12eb200d3b712c7a910997':
  [CB22] Merge add and delete