Merge tag 'upstream/1.0.0'