MSS-26
MSS-26 watchdog fix
Merge branch 'feature/MSS-26' into develop