Local changes
Merge branch 'qa' into cesar
Several changes
Setup the DB conn