Update ArticleFeedbackv5 to master

Change-Id: I5ce8b9d9f544f5abb69e79a8e182d3db4cbecf67