Bug 832239 - uplift to v1-train, continued