Promote 1.8 changes from dev to branch 1.8.