Change security configuration
Merge branch 'hotfix-1.0.0-alpha2' into develop