Merge pull request #1944 from TheBlueMatt/2022-01-lockorder-windows-robust