Updated Version 3.3.012
Merge branch 'master' into hotfix