Manually merged in emailArticleUpdates commit 799970b5ff2562d5e0c2aeb7a8ab5fa2841b29fe