I just put up a PR to fix the memory leak regression if we want to include that (tiny change)