Merged frm tizen 2.4 to tizen 3.0