Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2136-ref-PortMr1927-from-float-object-editing-broken-in-jbm