Merge tag 'upstream/1.9.4'