Fix feeds aggregation restrictions
Merge pull request #1044 from nlegoff/feed-restriction

[3.9] Fix feeds aggregation restrictions