Merge Tizen specific modification