Updated to handle timezones better
Updated for the time_of_day field setting to work properly
Merge remote-tracking branch 'remotes/origin/develop'
Small changes
Merge remote-tracking branch 'remotes/origin/develop'