Resolves Timezones

Merged Amir Golparvar requested to merge 836-Timezones into v1.1.1

Closes #836

Merge request reports