Merge "Fix a memleak in CLPF." into nextgenv2