version bump
Merge branch 'release/4.7' into develop