Merge branch 'upstream/13.0' into tizen