Merge tag 'upstream/2.7'