Merge Upstream version 1.6.36 from branch 'upstream' into tizen