Merge upstream version 2.0.1 from upstream into tizen