Merge pull request #1290 from Arantor/release-2.1

Feed fixes
Merge pull request #1293 from Arantor/release-2.1

Some more fixed things
Merge pull request #1296 from Arantor/release-2.1

More fixes
Merge pull request #1297 from Arantor/release-2.1

More fixes