Update ArticleFeedbackv5 to master

Change-Id: I33437841c70356e0de9b92bbb59a9c79f6dc49f7