Merge tag 'upstream/0.2.2a'