Feature/3487 split soledad into common client and server 3