Merge pollers from 2.2.0

+ Added couple of UI fixes