o Reintegrate Soledad into the client. Closes #3307.