Merge pull request #21072 from colemanw/apiTableName