(More pooling prep, I really don't want to have any sql update files in that PR if I can help it.) (cherry picked from commit 45bc91c238d04f2e2544622ff29faaf46713d15c)
(More pooling prep, I really don't want to have any sql update files in that PR if I can help it.) (cherry picked from commit 45bc91c238d04f2e2544622ff29faaf46713d15c)