Merge "use 64-bit counters in handlers for long-running ops" into tm-dev