Quickfix to avoid notices from template_process;
Merge branch 'feature/156-article_reviews' into develop