Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1