I'm making this pull request to start the process of finalizing the 2.5.2 hot-fix. I think the needed issues are resolved, and I have test files in place, so I'd like to start the testing process. If that passes, then update the versions, repack, and recombine, and do a final smoke test.
This also provides a place for any discussion needed for this hot-fix.