am 35c05cde: Merge "Handle ignored + assumption failure" into lmp-dev

* commit '35c05cdef6ffdece03f1e6b9dd22f999bbc9f4f0':
  Handle ignored + assumption failure