Merge branch 'tizen' into tac_env