Updated Version 3.5.025
Merge branch 'master' into hotfix