merged with updates from arango-client