Merge tag 'upstream/2.34.1' into tizen