copy of v1.0 config
Merge branch 'release/v1.1'