[Non-BE] Resolve "Two decoding paths in the decoder" See merge request !1164
mentioned in issue #867 (closed)