Merge pull request #21620 from colemanw/purifier2