Merge "Introduce HashSiteStore, mainly for use in tests"