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