Merge branch 'release/4.7.1' into develop
Minor updates
Update version
Merge branch 'release/4.7.2'