Merge pull request #653 from emmanuel-keller/1.5

Improve locking isolation in config.
Merge pull request #656 from emmanuel-keller/1.5

Fix #642.