correction for timezone
changes for timezone nan problems
Merge branch 'refactoring' into preprod