B-58092 updating dist datastore based on pull request feedback