Merge pull request #1987 from anandpdoshi/anand-july-25

[fix] Feed listing based on permissions