Merge pull request #1725 from TheBlueMatt/2022-09-no-bench-lockorder