Merge branch 'upstream/2.26.1' into tizen