Merge tag 'upstream/1.3.1'