Provide default configuration that may be overridden.
Merge branch 'development'