Merge pull request #2841 from TheBlueMatt/2024-01-batch-deadlock