Merge "Add 'Remove all then re-add'." into lmp-mr1-dev