Port MR1947 and MR 1952 from float to BASOP - Object editing broken in JBM Closes #2136 See merge request !2420