Merge "Bug 1534: Changed blocking calls to async in dist data store"