am c40da54b: Merge "Fix freed memory references" into lmp-dev

* commit 'c40da54b34138856446e79245ac45600191962b5':
  Fix freed memory references