Merge "TBR namespace:  rename Remove to Delete"