am e62a18e5: Merge "various fixes:" into lmp-dev

* commit 'e62a18e572b745c6b92794bfa3ac41eaa5c61ee4':
  various fixes: