Merge commit 'd7b43ec' into tizen