Merge EHD integration progress