Merge pull request #1238 from TheBlueMatt/2022-01-lockorder-checks