ConfigService Bugfix
Merge commit '0c3efbf44371d2a311fbf8bb46e2a551cf69e9e0' into feature/domainalias