[642] Fix cherry-pick from stable.
[642] Cope with ints in XLS dates.