Merge "Plug memory leak. Bug #6196903"