Update ArticleFeedbackv5 to master

Change-Id: I3f4e59d1811bec15842d72a6c1e432421049f6ae