Merge pull request #19798 from colemanw/api4cleanup