Merge pull request #1352 from TheBlueMatt/2022-03-debug-rwlock