Updated timezone issues w.r.t. DST
Merge remote-tracking branch 'remotes/origin/develop'