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