Merge branch 'ode' into tizen