Merge branch 'fix_1985_sba714_out' into 'main'

[non-BE][split-non-be][allow-regression] Fix 1985 sba714 out

See merge request !2197