Integrate cctools-758 changes