Merge tag 'upstream/2.34.0' into tizen