case 3488 - Minified watchdog message.
Merge remote-tracking branch 'origin/case-3488' into develop