Merge branch 'tizen' into 'ode'