Update ArticleFeedbackv5 to master

Change-Id: I1a075974ebfb4a7f3faca3294927c88329aad442