Poller - don't merge yet