Merge branch '1870-basop-PortFlpMr1860' into 'main'

Port MR1860 from float to BASOP

Closes #1870 and #1849

See merge request !2002