Update changelog
Update version
Merge branch 'release/0.6.16' into develop