Merge pull request #18727 from colemanw/entityTest