Merge tag 'upstream/2.35.1' into tizen