Merge pull request #2597 from TheBlueMatt/2023-09-finish-force-close-deadlocks