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