Merge "Merge branch 'devel/master(1.2.18)' into tizen" into tizen