Merge branch 'release/1.6.0' into develop
position field for pages
version bump
Merge branch 'release/1.7.0'