[odcctools-changes] [156] trunk