Manual merge of emailArticleFunction branch
Missed a manual merge