Merge "Implement persistent repository." into main