Merge from tizen_3.0