ACF-35: Merge clients with collections