Revert "Revert "update datastore dependency to 2.0.4""

This reverts commit 75fdb4e6de09af9f79c0a9d8fc6aabbe3851894f.