Update ArticleFeedbackv5 to master

Change-Id: I1eb39e2b0f383b21473602467af14a807dc75fc4