Merge remote-tracking branch 'trace/tizen'