Merge "ClusteredDataStore integration testing"