Merge remote-tracking branch 'data-control/tizen'