Merge branch 'devel/upgrade' into tizen