Merged Pooling features from lateau with latest changes from downstream ...

All credit for the proposed changes should go to lateau. I merely merged the changes with the latest master to make it easier on the repo master.

This is a great and welcome feature.