[3.9] Fix feeds aggregation restrictions