Merge "Fixes a wrong cast position." into udc-dev