changes to timezone and data retention
Merge branch 'dev_adjust_timezone_retention'