Update ArticleFeedbackv5 to master

Change-Id: I70ba8e4538f6c6b4af541d5cde2abfae8f8120b4