Fixes
Merge branch 'master' into hotfix
Updated Version 3.1.24