am 2d8f1ca8: (-s ours) 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 '2d8f1ca8c21e1efd72ada123792fde731418232f':main
commit
e90347d5be