Merge Upstream version 1.6.21 from branch 'upstream' into tizen