Merge "BUG fix for DB connection"