Fixed Issue with name of DB (included user id when creating db)
Merge branch 'bxie-bla-dev' into bxie-bla-prod