Hopes to fix a build issue in a dependent project.
fixes some chicken-and-egg client and domain issues.