Merge commit 'upstream/1.7.0'