quick fix to handle issues when there is a
Merge branch 'develop'
Merge branch 'bug-csf-RockRSSFeed'