CLOUD-304 fixed pollers