Merge "Handle ignored + assumption failure" into lmp-dev