Merge branch 'release/4.7.0' into develop
Fix fakers. Fix yadm.
Update version
Merge branch 'release/4.7.1'