Merge tag 'upstream/1.2.5'