Merge "[Bugfix][API-619][SMS]Fixing memory leaks" into MR3.0