HHH-9344

Proposal for more efficient time tracking.

@sebersole if you agree with the changes, I'll push on 4.3 and master.