Autogenerated default config
Merge branch 'develop'