Merge branch 'release/2.0.10' into develop
added setsecure config option
Merge branch 'release/2.0.11'