Hotfix to feed service
Merge branch 'refs/heads/master' into release