Add configuration properties to the service.
Merge branch 'config' into develop