Version 1.7.1
Merge branch 'release_1.7.1' into release
Merge branch 'release' into dev