Merge branch 'release/4.7.0' into develop