Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1934-ref-PortFlpMmr2139