Issue #3263968 by bircher: separate state config override services to attempt to avoid circular references in some cases