Update ArticleFeedbackv5 to master

Change-Id: I9f0defe872a9b1671819bcbf41b5ff7fe935d33d