readd db
Merge branch 'dev' into fifo