Merge tag 'upstream/2.1.1'