Update ArticleFeedbackv5 to master

Change-Id: I5bf7bcdce2ccebe5dae3bb1bc6e97001176bc9dc