Architecture diagrams for PSR
Fix record merging bug