Fixed
Merge branch 'bug/feed_order'