Merge changes I0deb6ab7,Ib8183f9d into tizen