Merge "Fix decoder EOS handling"