Merge pull request #16457 from colemanw/api4doc