Update versions for 4.7.0 release.
Merge branch 'release/4.7.0' into develop