Merge "Shift some processing to a handler." into udc-dev