Bz1151321 6.4.x