DB changes to abstract
Merge branch 'master' into compile
build