Merge "fixed bug" into tizen_2.2