Further looking into the memory leak. No fix yet