merge from dhwz base