Bug 1016885 - v2.0 uplift