Merge branch 'hotfix/2.5.2'
enabling settings in release
Merge branch 'hotfix/2.5.3' into development