Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1887-ref-PortFlpMr1788