Merge pull request #1420 from TheBlueMatt/2022-04-moar-lockorder