Fix conflicts from dhongu merge.