speed up insert
Merge branch 'dev'