I can do that while merging, as long as I also know if anything needs to be done about XD_CONTROL_TRANSPORT based on the discussion above.