Merge remote-tracking branch 'origin/ivas-float-update' into 1863_ref_port_fl1678