fixed issue with incorrect timezone type
Merge branch 'release/bug_fixes'