[fixed] stability issues

Change-Id: I0503d95b21448072dde4a2f9725d20e845985e5c
Merge "[fixed] stability issues" into unstable