Merge branch 'release/1.1' into develop
Config renamed back to default
Merge branch 'develop'
Config renamed back to default
Merge branch 'develop'