Deploy bugs 1060289 and 1060305