TOP-1158 rework time averaging

Reworks the time averaging logic. It is now not pre-calculated any more, but caching could potentially be added should this become useful in the future.

This MR follows on from !94 (merged), and as such contains the commits included in the preceding MR as well. As soon as the preceding MR is merged, the change-set of this MR will decrease.