Merge "Recover from errors" into lmp-dev