Merge tag 'upstream/1.9'