Working on feed display intervals
Merge branch 'develop'