10 Years Ago
Merged from Persistence branch.