Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'