Merge "BUG-2606: formalize the augmentation removal"