Merge tag 'upstream/1.7'