Merge pull request #22783 from colemanw/api4DateFunction