Merge Timezone override changes into fix-date-functions branch