Sync to tizen_2.1 branch