Checkpoint of TRN-368.
Added fetcher tests to TRN-368.
Added datastore tests to TRN-368.
TRN-368 Implementation complete including tests.
Merge branch 'master' into TRN-368
Merge branch 'TRN-368' into TRN-333