Merge "Sync with the private repository" into tizen_2.1