Merge tag 'upstream/1.2.0' into tizen_base