Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2107-ref-PortMr1671-from-float-cleanup-20240704