Merge tag 'upstream/1.1.0'