Bug 1077609 - uplift to v2.1.