Merge tag 'upstream/0.16'