Extra backend configuration
Merge branch 'feature_backend_extra_config' into develop