Merge pull request #17746 from colemanw/apiExpHaving