[fixed] stability issues

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