Merge branch 'ivas-float-update' into 1825_ref_PortFlp1531