DatastoreConfig addition
DatastoreConfig addition
DatastoreConfig addition
DatastoreConfig addition
DatastoreConfig addition
Merge origin/davetest into davetest