Merge "Clean Split repo todo" into udc-dev