Merged from tizen_2.4 to tizen_3.0