Update ArticleFeedbackv5 to master

Change-Id: Ie2d10ec3eedd320109538c6c19c7cbc6da0f26b3