Merge "Remove unused ITYPEs" into udc-dev