Unify FixedTime and Time while fixing several problems
#8964
+1,586
−855
FixedTime and Time while fixing several problems
#8964