Merge "Fix new TIF code" into udc-dev