Following up now that 10.5 is out. v3 still applies clean on current master, and the leak is still present (the XXX comment in import_environments() marks it). Happy to rebase or adjust if anything is needed. Avi