case 3488 - Minifiend watchdog message.
Merge branch 'case-3488' into develop