Update ArticleFeedbackv5 to master

Change-Id: Ie1d4f3305899f6a4c2c0472f3e48425c236a8e56