Fixing date to use UTC
Merge branch 'local' into dev