Bug 1002327 - v2.0 uplift