Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1700_ref_PortFlpMR1511