f5b57e6 Merge branch 'release/v1.8.0'