Merge pull request #18449 from colemanw/multiValueAutocomplete