Merge branch 'upstream' into tizen_6.0_base