Merge "Metric System Cleanup" into udc-dev