Merge branch '1657_basop_osbaExt' into 'main'

[non-BE] Port MR 1638 from float to main

Closes #1657

See merge request !2030