updates for cdo and cdi release 1.6.0