Merge "Fixes SQLRegistry persistence"