db lock issues fix test
db locking issues fix #2
Merge branch 'origin/dev'