Merge pull request #22234 from colemanw/afformDateRange