-locks for read/write operations
Merge commit 'd9860303e0b2d4c02cb3d67d0acb473ae89c20db'