Deploy bug 1045888 and bug 1046655