Merge branch 'FhG/5ms-api-continuation' into 'main'

[Non-BE] Resolve "Two decoding paths in the decoder"

See merge request !1164