Merge change 1722 into donut

* changes:
  Handle null timezone.