Merge commit 'f22be37' into tizen