merge from tizen_2.4