Merge branch 'upstream/1.16' into tizen