Merge 1.8.0 - Release