Merge pull request #20283 from colemanw/afformEnabledEntities