updated unified branch; bug 885043