Merge tag 'upstream/1.8.5p2'