Merge branch 'dev'
Bump version to 0.7.17