Merge "Fix freed memory references" into lmp-dev