Quick Time Limit Change
Merge remote-tracking branch 'upstream/hydro-devel' into hydro