BUG-8205: use updated DatastoreContext