Merge tag 'upstream/1.2.2'