Bz1074530 6.3.x