Merge pull request #21643 from colemanw/afformUrlArgs