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

* commit '2d09745626af3f3c052da58df5507f92d9244e3a':
  Recover from errors