Merge (most of) r1876599 from trunk * Add missing pool tags to help debugging Submitted by: ylavic Reviewed by: jailletc36, gbechis, ylavic Backported by: jailletc36