Merge "Fix decoder EOS handling" into klp-dev