Merge "Update time format" into sc-dev