Hmh. Seems like the memory leak PR wasn't merged when I started this branch and seem to have accidentally created this pr from that branch