Fix bug 876772

uplift to v1-train