Merge tag 'upstream/0.7'