Merge pull request #1957 from TheBlueMatt/2022-01-mon-ref-lockorder