Merge tag 'upstream/3.14'