Merge "Convert use of Time.format() to an alternative"