Merge pull request #22776 from colemanw/fixApi4EnttiyGet