Merge tag 'upstream/034'