Merge pull request #22826 from colemanw/api4EntityTypes