Merge "Create InputTarget in a separate function" into udc-dev