am 193fea55: am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit '193fea55d98b3964f1c8d7174e39abc40bb0633e':main
commit
2d8f1ca8c2