Issue #18716 First pass at Discovery Doc.