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