Roll elkdb version 0.6.9
Merge branch 'release/0.6.9' into develop