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