Merge branch 'add-tx-stop-wake-counters'