Merge "Remove legacy subscription code" into udc-dev