Merge branch '2136-basop-mr1947-and-mr1952-from-float-object-editing-broken-in-jbm2' into 'main'

Port MR1947 and MR 1952 from float to BASOP - Object editing broken in JBM 2

Closes #2136

See merge request !2434