[3.9] Fix Feed aggregate to suit the interface