Sync with cctools-836, no major changes