Merge "Merge branch 'sandbox/cyeon/devel' into tizen" into tizen