Merge branch 'devel/master(1.2.60)' into tizen_4.0