Merge branch 'yaca' into tizen