Fix db problem
Merge branch 'next' into feature/rest