Changes for timezone
Merged