Bug959400 phase2