Comment 4 for bug 506158

The linked stop-checkwatches-hammering-bug-506158{,-devel} branches fix the bug originally described in this branch. The stop-checkwatches-hammering-products-bug-506158{,-devel} branches do *not* fix the additional bug described in comment #2, but are a good workaround for now. Work to fix the batching problem in a more complete way is being tracked in bug 509223.