Use internal db variables and no local bundle
Merge branch 'master' into bugs/63