[fixed] stability issues
[fixed] mem leak

Change-Id: Ic9dfb412398b5820a077897185133d29cc944459
Merge "[fixed] stability issues [fixed] mem leak" into unstable