Merge branch ckm into tizen