Merge tag 'upstream/0.21'