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

* case-3362:
  Case 3362 - Fixed __wake() issues.