d3b0778 Merge branch 'release/v1.7.0'