MODE-2093: Multiple repositories (Client-view)