Merge pollers from 2.2.0