Merge pull request #21185 from colemanw/campaignLists