Merge "Fix DGBUILDER DBHOST reference"