Merge changes from topic "null_callback"

* changes:
  Fixed null callback issue
  Added debug messages and watchdog