Merge pull request #2163 from TheBlueMatt/2023-04-less-lock