Merge from dhwz Base