Merge pull request #21228 from colemanw/afformFixTitle