Merge gh-1230 to add more feed data