am 5002d02e: Merge "Recover from errors" into lmp-dev

* commit '5002d02e545dafbcf129b2e5bccf087e765019e5':
  Recover from errors