Merge tag 'upstream/0.19'