Merge branch 'hotfix/updates'
Validate feed
Merge branch 'hotfix/feed' into develop