Merge "Work Around TC-1560" into tizen