Merge "Revert "Fix decoder EOS handling"" into klp-dev