ACF-35: Client entity removed
ACF-35: Merge clients with collections
Merge branch 'feature/ACF-35' into dev