Merge branch '1657_ref_osbaExt' into 'ivas-float-update'

[non-BE] Port MR 1638 from float to ivas-float-update

See merge request !2029