Bz1102655 part2 6.3.x