Update fully to 1.8, and begin backport to 1.7