Merge remote-tracking branch 'badge/tizen'