DateValidator improvement for the #6406 issue