Merge branch 'ivas-float-update' into 1813_ref_port_MR1524