Bug 1043293 - v2.0 uplift