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

* commit '8c8f56ca16fd9d28ea2c2bf1d4f2fe59dcb1a8a7':
  various fixes: