Another hotfix to feed service
Merge branch 'refs/heads/Released/beta8' into release
Merge branch 'refs/heads/release'