Fix:merge issues
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel':release version
Fix:aria.sh