Merge branch 'release/1.8.0'