Update ArticleFeedbackv5 to master

Change-Id: Iccad55d17519a8f1cfbc6dad8f0e09c74668bdd9