Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client...