Merge 1.8 upstream release