am dfc77d88: Merge "Fix incoming callback and binding issues." into klp-dev

* commit 'dfc77d88ca5aef745f56d1e8af283dfa15851025':
  Fix incoming callback and binding issues.