[fixed] Stability issues

Change-Id: I70df208e0d6cd876b9f97b9f8e1fca234c9aff20
Merge "[fixed] Stability issues" into unstable