Merge branch 'release/0.6.16' into develop
Fix race-condition's bugs
Update for v0.6.17
Bump elkdb to 0.6.17
Merge branch 'release/0.6.17'