Merge pull request #23648 from colemanw/afformUndo