Merge branch 'release/1.7.1'