Merge "Memory leak due to bad destroy sequence"