Do not create the client with every request
Merge remote-tracking branch 'origin/collection-map' into collection-map