Merge branch 'develop'
Release v1.8.8