Merge branch 'fix-feed-pagination' into 'develop'