Merge pull request #23899 from MegaphoneJon/civigrant-afform