Merge branch '1664_basop_portFlp1685' into 'main'

[non-BE] [allow-regression] Port Float MR1685 to main

Closes #1664

See merge request !2080