Merge tag 'upstream/1.41' into tizen