am aebdc758: (-s ours) am 86b5fedf: am 69de823e: (-s ours) am 472bace7: (-s ours) am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit 'aebdc7585b1635fb11d8936a6508ee2539c615ef':main
commit
70bff0fccc