Issue #18716 Add Discovery List function.