Merge branch 'cynara' into tizen