i058959 - for updates of cdt_8_3