Merge tag 'upstream/0.6.2'