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