Merge changes to use a (shared) default client in master