Merge remote-tracking branch 'origin/ivas-float-update' into 1564_ref_PortFlpMR1476