adding watchdog facility.
Merge branch 'bug/2558' into integration