Merge "Bug Fixes: remove Db name + path"