Merge tag 'upstream/0.8.0.6'