Merge pull request #19687 from colemanw/afformShortcodes