Merge branch 'userfeed-fe-fallback' into 'develop'