i058959 - for cdt 8.3 folder migration