Reformat time stamp
Merge branch 'Step_1' into Step_2
Merge branch 'Step_2' into Step_3