Merge remote-tracking branch 'upstream/develop' into develop
Fix for manual + source feeds (# 549)
Merge remote-tracking branch 'spapas/develop' into staging