am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev

* commit 'e2f3892fcbf59c54deb38287b20b4083a3f324ca':
  Add 'Remove all then re-add'.