am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE

* commit '9b9d17f99c2f1be7fbdf55a3b5403b865942beb7':
  Use reentrant lock for main dictionaries. DO NOT MERGE