Merge branch '1522_ref_PortFlpMR1349' into 'float-pc'

[non-BE] Port float MR1349 to BASOP FLP ref.

See merge request !1497