Merge "Fix track-assignment omission" into udc-dev