Merge branch '1936-basop-PortFlpMr2133' into 'main'

[non-BE] [allow regression] porting MR2133 from float to BASOP

Closes #1936

See merge request !2138