Merge branch 'release/v1.6.0' into develop
All data fetched from cache
Bump version numbers
Merge branch 'release/1.7.0'