Merge branch 'master' into develop
Case 3362 - Fixed __wake() issues.
Merge branch 'case-3362' into develop

* case-3362:
  Case 3362 - Fixed __wake() issues.
case 3488 - Minified watchdog message.
case 3488 - Another minified watchdog message.
Merge branch 'case-3488' into develop
Merge branch 'develop'