Bz1108690 6.3.x