Merge tag 'upstream/0.8' into tizen