Changes for CSCun38717