version bump
Merge branch 'release/4.7.1' into develop