Delay db inserrtion
Merge branch 'release/v0.3.8'