Integrate cctools-822 changes