WIP 0110-odcctools.patch split-up