Merge tag 'upstream/3.2.3' into tizen