Updated Version 3.5.022
Merge branch 'master' into hotfix