synchronize between master branch and tizen_2.1 branch