Merge tag 'upstream/1.6'