Merge "Dismantle remove labels prototype" into sc-dev