v1.8.0
Merge branch 'develop'