Ticket0553: Major memory leak issue