[odcctools-changes] [152] trunk