Merge branch 'fix/1691-feed-render' into 'develop'