Merge tag 'upstream/0.3.6'