Bug 1016885 v1.3t uplift