Import changes to support DH configuration directive