Merge tag 'upstream/1.40' into tizen.