Merge "Fixed missing/wrong references in DG Builder chart"