Merge branch 't/decoder_fixes'