Merge pull request #1152 from ben/clone-api-structification Segregate in-memory and persisted remotes