Merge pull request #23385 from colemanw/defaultToIndividual