Merge tag 'upstream/0.1.4'