Merge branch '1522_basop_PortFlpMR1349' into 'main-pc'

[non-BE][allow regression] Port float MR1349 to BASOP.

See merge request !1498