Merge "Rephrase progress_erasing to be generic"