Bug966830 focus

Bug966829 &  Bug966830 focus