Merge "Fix not tracking splitting tasks correctly" into udc-dev