Issue #20838:fix date conversion