Merge remote-tracking branch 'remotes/origin/main' into 2136-basop-PortMr1927-from-float-object-editing-broken-in-jbm
