[CLC-1178] Lots of Timezone related fixes