Changes to make continuous feed work like polling feed