Merge branch 'devel/master(1.1.39)' into tizen