Make buffer pooling switchable
Prep 3.3.0.CR2
Next is 3.3.0.CR3