Merge changes from topic "jr-blocker"

* changes:
  Initial notification blocker
  Provide more information to the noti asst