Merge remote-tracking branch 'origin/ivas-float-update' into 2054-ref-PortMr2140-from-float