Merge tag 'upstream/0.0.7'