Merge "Fix proportional counting for out-of-order timestamps" into tm-dev