Merge "Local persistent store for Postgres"