Merge branch 'ivas-float-update' into 1809_ref_PortFlp1510