trigger rate calculation in all the right places
Merge bug 26004