Update ArticleFeedbackv5 to master

Change-Id: I09eb03a8bad1b832a901bb5c255bc75d15f56a21