Merge branch '1128-osba-ext-output-wrong-for-foa-hoa2-inputs' into 'main'

[non BE] Resolve "OSBA EXT output wrong for FOA/HOA2 inputs"

See merge request !1638