do not wrap callback messages
Merge branch 'master' into inversion

* master:
  do not wrap callback messages