Merge tag 'upstream/3.052'