Change too work with testing.
Some testing updates
Merge remote-tracking branch 'origin/develop' into develop
RSS Feed should now be working again
(cherry picked from commit 115374a)