Merge tag 'upstream/0.22'