Merge pull request #1269 from TheBlueMatt/022-01-no-disconnect-on-slow-persist