Merge "Support non-replicating DB clusters for static datasets"