Alterations for feed jobs
Separate some template logic for better results
Merge remote branch 'origin/dev'