utc display fix
Merge branch 'timestamp-fix' into testing