Merge tag 'upstream/2.17'